bbc15a55c35e5d261ab43dbb988430e4c8bf18df,community/main/java/org/neo4j/kernel/ha/MasterClient.java,MasterClient,sendRequest,#RequestType#SlaveContext#Serializer#Deserializer#,62

Before Change


            // Send 'em over the wire
            ChannelBuffer buffer = ChannelBuffers.dynamicBuffer();
            buffer.writeByte( type.ordinal() );
            writeSlaveContext( buffer, slaveContext );
            serializer.write( buffer );
            client.channel.write(buffer);

            // Read response
            ChannelBuffer message =
//                client.blockingReadHandler.read();
                client.blockingReadHandler.read( 20, TimeUnit.SECONDS );
            T response = deserializer.read( message );
            TransactionStreams txStreams = readTransactionStreams( message );
            return new Response<T>( response, txStreams );
        }
        catch ( IOException e )

After Change


            // Send 'em over the wire
            ChannelBuffer buffer = ChannelBuffers.dynamicBuffer();
            buffer.writeByte( type.ordinal() );
            if ( type.includesSlaveContext() )
            {
                writeSlaveContext( buffer, slaveContext );
            }
            serializer.write( buffer );
            client.channel.write(buffer);

            // Read response
            ChannelBuffer message =
//                client.blockingReadHandler.read();
                client.blockingReadHandler.read( 20, TimeUnit.SECONDS );
            T response = deserializer.read( message );
            TransactionStreams txStreams = type.includesSlaveContext() ?
                    readTransactionStreams( message ) : TransactionStreams.EMPTY;
            return new Response<T>( response, txStreams );
        }
        catch ( IOException e )